Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Wed, 17 Oct 2012 21:07:59 +0000 (23:07 +0200)
committerEli Zaretskii <eliz@gnu.org>
Wed, 17 Oct 2012 21:07:59 +0000 (23:07 +0200)
commit4941b980644154b3a53b465b5efeb917f1be5bf3
treed74ffcdff76ee8b8226e8375f306677ea26ac0dd
parent641cdcb5e8ea57b9f521ce655e7a945e9846b068
parent3f39acdeaf46d24e655384406110b3b7f520e40b
Merge from trunk.
lisp/ChangeLog
src/ChangeLog
src/alloc.c
src/lisp.h
src/makefile.w32-in
src/w32fns.c
src/w32proc.c
src/w32term.h